From c52088d89aa94d036da8ab5b8b7b47416c4996dd Mon Sep 17 00:00:00 2001
From: Daniel Carl <danielcarl@gmx.de>
Date: Mon, 10 Apr 2017 21:47:20 +0200
Subject: [PATCH] Fix wrong path to extension directory.
---
Makefile | 6 +++---
config.mk | 7 ++++---
src/main.c | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 63a4393..8b8a941 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@ install: $(SRCDIR).subdir-all
install -d $(BINPREFIX)
install -m 755 $(SRCDIR)/vimb $(BINPREFIX)/vimb
@# extension
- install -d $(EXTPREFIX)
- install -m 644 $(SRCDIR)/webextension/$(EXTTARGET) $(EXTPREFIX)/$(EXTTARGET)
+ install -d $(LIBDIR)
+ install -m 644 $(SRCDIR)/webextension/$(EXTTARGET) $(LIBDIR)/$(EXTTARGET)
@# man page
install -d $(MANPREFIX)/man1
@sed -e "s!VERSION!$(VERSION)!g" \
@@ -27,7 +27,7 @@ install: $(SRCDIR).subdir-all
install -m 644 vimb.desktop $(DOTDESKTOPPREFIX)/vimb.desktop
uninstall:
- $(RM) $(BINPREFIX)/vimb $(DESTDIR)$(MANDIR)/man1/vimb.1 $(EXTPREFIX)/$(EXTTARGET)
+ $(RM) $(BINPREFIX)/vimb $(DESTDIR)$(MANDIR)/man1/vimb.1 $(LIBDIR)/$(EXTTARGET)
clean: $(SRCDIR).subdir-clean
diff --git a/config.mk b/config.mk
index 7bf9728..2ca83c7 100644
--- a/config.mk
+++ b/config.mk
@@ -5,8 +5,9 @@ BINPREFIX := $(DESTDIR)$(PREFIX)/bin
MANPREFIX := $(DESTDIR)$(PREFIX)/share/man
EXAMPLEPREFIX := $(DESTDIR)$(PREFIX)/share/vimb/example
DOTDESKTOPPREFIX := $(DESTDIR)$(PREFIX)/share/applications
-RUNPREFIX := $(DESTDIR)$(PREFIX)
-EXTPREFIX := $(RUNPREFIX)/lib/vimb
+LIBDIR := $(DESTDIR)$(PREFIX)/lib/vimb
+RUNPREFIX := $(PREFIX)
+EXTENSIONDIR := $(RUNPREFIX)/lib/vimb
# define some directories
SRCDIR = src
@@ -18,7 +19,7 @@ LIBS = gtk+-3.0 'webkit2gtk-4.0 >= 2.3.5'
# setup general used CFLAGS
CFLAGS += -std=c99 -pipe -Wall
#CPPFLAGS += -pedantic
-CPPFLAGS += -DVERSION=\"${VERSION}\" -DEXTPREFIX=\"${EXTPREFIX}\"
+CPPFLAGS += -DVERSION=\"${VERSION}\" -DEXTENSIONDIR=\"${EXTENSIONDIR}\"
CPPFLAGS += -DPROJECT=\"vimb\" -DPROJECT_UCFIRST=\"Vimb\"
CPPFLAGS += -D_XOPEN_SOURCE=500
CPPFLAGS += -DGSEAL_ENABLE
diff --git a/src/main.c b/src/main.c
index 65b188e..75023bb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -805,7 +805,7 @@ static void on_webctx_init_web_extension(WebKitWebContext *webctx, gpointer data
GVariant *vdata;
/* Setup the extension directory. */
- webkit_web_context_set_web_extensions_directory(webctx, EXTPREFIX);
+ webkit_web_context_set_web_extensions_directory(webctx, EXTENSIONDIR);
name = ext_proxy_init();
vdata = g_variant_new("(ms)", name);
--
2.20.1